Fix minor bugs in arm/s.py. Tests pass.