fix a few regressions in refactored interpreter

Some of the simpler tests pass, but there's still a lot of work left
to do.