Match changes in wai-extra 2.0.1