Refactor: Tidy ContentLocator classes.