Clean-up call patterns for add/contains/discard to better match the caller's needs.