Handle ambiguous source specs, not idealy, but consistently.
Add some more sources to the catseye-stars catalog.