Agreed this could be simplified in the future; FWIW I've just inlined the `expiry_date.rb` file at this point, not really changed the functionality.