While most of this code is unexercised with just this commit, I wanted
to add it so that it's more clear what the multiple inheritance changes
actually are.