Clean block improvements - fill in skipped sections and allow branches (both off by default).