Fix the Halting Problem in UniqueKeyedService

This one didn't halt. Now it does.