Minor cleanup in `coordinates` sub-package
Merge pull request #1571 from cdeil/coordinates_cleanup with manual merge