Fixes to handling of lemma forms by the preprocessor