Minor optimizations in the XlinkController for reusable resolving