Preparing to start reworking the parser.