Issue #3107712 by ankushgautam76@gmail.com, Suresh Prabhu Parkala, DamienMcKenna: PAReview.sh recommended fixes.