Cleanup, but got a better handle on uid dispatching.