This is the only really functional change here -- I pass in an extra value so that clamshell can keep a token for a month. This *will* change in a future release; it's just enough to get us through for now.