Switching back to full pump arm switchover, and some cleanup.