Change service lookup to always work with the current handle. Also little other cleanup.