ENH][VM] Improved code generation (hopefully ;)