Straightens out some inheritance code.