Cleaned up pp section, moved now-defunct lexer section to parser section.