Cleanup and fix compilation problem in Pygmalion.hs