Clean up how content patch locations are handled.

Refactoring to lay the ground work for future new
content patch locations (e.g. "tlk").