even safer handling of expiration types across