Fixes re: @jonathandavis

A better approach.
Merge branch 'cc-expire-fields-change' of https://github.com/crunnells/shopp into crunnells/pr/3151