Moved methods into the superclass.