#1078: #1045: tweak to marginal blocks and head
opened by thuchacz