Fixed bug that didn't clean up stubbed class methods. Also changed copied code to a DRYer alias chain.