more execution flow cleanup, refs #298, #215