Improve accuracy of unit argument to resolver lookup functions