Make Anonymous classes less anonymous

This shuts up FML, and also means we'll survive a 1.7 upgrade. Maybe. Probably not. Worth a go.
Manually merge because of Git derp