bring javacc-generated code in line with new package structures.