Further clean up Translator.hs (almost done now)