Expiry field should handle delete and / as if / wasn't auto inserted. Fixes #13