Cleaning up lexers, fixed != puncts
Removing unused imports
Improved starts with check to use base
V2.1.2, fixes mattbierner/khepri#114