Fix to use the new fallback service name.

Cleaned up a lot of the naster inner-loopedness going on.