Upstream changes from docopt/docopt.