Minor simplification
Get rid of expression.rkt
Refactor variable support
Reorder functions with macros