Eliminate a bunch of one-off unnecessary anon classes.