5fe1e0c1a5
Commit cceb7197 removed restriction of non-nullability of diagnostic
arguments, but corresponding utilities were not updated