#691 - Move some thin context resolution calls to a more appropriate place