[#3213] Partially addressed code review points.