Fix a nasty superclass expansion bug