Minor syntax improvements
Merge branch 'v3/5574' into v3/6201_5574
Minor syntax improvement.