more execution flow cleanup, refs #373, #290