IDI-104: Minor simplification of resource fetching.