WIP: Change MRO to match @njsmith's description.