Re-write more for register-based VM