Further simplified VM state handling