Cleaned up some messy virtual funcs.