Fix bug introduced by cleanup change #87. DumpVisitor is still needed as it will take multiple phases to generate code