Don't override options.expires

Currently if you define both options.expires and options.maxage, maxage overrides expires.

Resubmitting with a bugfix and because I screwed up the other branch.