Tidying up some inheritance issues.