Looks like I missed two points when reviewing @tacaswell's parts of #11246: https://github.com/matplotlib/matplotlib/pull/11246#pullrequestreview-204527495 and https://github.com/matplotlib/matplotlib/pull/11246#pullrequestreview-204536283.