Should this or related code do anything about expiry times in the past?  Presumably, that's for another bug, but worth asking...