Rejigger config due to OptionParser#on's horrendous arity