Change parser so that defines can appear before or after the expression
Use Num for Int to make separation clear
Make the expression optional
Remove comment
Remove redundant code