WIP on pretty-printing.
WIP on pretty-printing; clean up FreeNames.hs and Substitute.hs