fixup! Further improvements to interface hierarchy