partial addition of new exprire_ location and semantics that don't break tests