This reverts commit fb7fe499. The commit introduced a bug where an option with the `All' subcommand would not be added to a category initialized after that option.
