Clean up the method replacement mess.