remove unnecessary inline defns
Remove unnecessary inline defns
made a start on a pretty printing pass
pretty print the program
fix a couple of thinkos