GATEWAY-3247: Updates per code review comments.