#KJ-81 Extend the semantics to work in either full mode or prep+exec. Corrected 3-rd bug from 2 commits ago.