Compiler cleanups related to generalized mixin work.