WIP: Fix MRO bug & normalization.