Separate parse and parse_execute.
Fix mode transition.