Quit using the built-in visitor so I can get elements in the right order