EZP-22151: yet more docblock cleanups