Tidy up CreoleASTBuilder