DIAGRAM: rm obsolete maybeDiag calls

We handle these conditions inside the functions themselves
by checking the DiagProp.