tidying up before changes to nonblock_do_construct
tweak dolabel-related methods
merge fixed-form first-line comment fix & tests from mh