Improved subclass support.