Group `["option", "progress", ..]`, and `["option", ..]` cases together during match. Make the key/value matching cleaner using `ok_or_else` and then matching on the key value.