Making some changes for clarity

All itemExpirer touches happen in the same place now.  Inspired by peer
review comments from @eulerphi