Comment subterms a little
Fix some suggestions from hlint