Make keywords better aligned
Use the more general \b rather than space
Make the infix regular expression smaller
Merge branch 'haskell/clean-up'