Clean up aliases for lexers.
Style fix for some comments.