Some cleanup + Pyro and Switch arrows.