Merge the two service entries into one.

Turns out you can't have the same keyboard shortcut for two items, even if they'll only ever be active in different contexts. Switching back to a single entry solves that. All the other improvements still work, we just don't have two separate labels.
Merge branch 'services-fix'