Further improvements to monkeypatch doc comments