Add kludge to sidestep unresolved errors, remove repeated code from subclasses