Tidied code in vrm0.