Slightly simplify the interpreter
Remove unneeded mutual recursion