consistently track uses and omits