More reorganization in arm.cs