This is a follow on to aaea2480. In post commit discussion, Artur and I realized we could cleanup the code using Uses; this patch does so.