GATEWAY-3362: Updates per code review comments.