<oo-diag> clarify text and robust-ify