Return to using 2 funcs for control block start/end; some cosmetic