Remove APIs deprecated for 0.5. Also move around some operator classes and singletons.