Cleanup the JIT as per PR176. This renames the VM class to JIT, and merges the