It might be worth adding a clause for the expired=true case.