Always give VM with new dex builder

Also, refactor and clean up in preparation for more peephole
optimizations and tests.