Some minor refactoring gets us to an almost compiling SableCC bit.