More cleanups

The only remaining failure is looking like a precomp bug.