#4344 Review fixes.