This fixes #7554.
More work on bug #7556.
More work on bug #7557.  The base classes no longer implement the interface.
More work on bug #7556.  The base classes no longer inplement the interface.
More work on bug #7555.  The base classes no longer implement the interface.