Lexicon updates.
More preprocessor integration.