- Fix confusing use of static subclass methods