Some minor cleanups from the core virtual machine.