Metrics cleanup

I removed more things that were already defined the way I wanted in
fallback.  It's under 2k lines now!

Yay?