Cleaned up some more owner references.