Remove dead "ghetto lock" code.

Fire the callback at the end of declaring an RPC queue

Reorder the condition in ensure_rpc_queue for clarity