Get rid of ? macro, which wasn't quite the ternary operator
Minor cleanups
Make keywords distinct from strings at compile-time