GATEWAY-3388: Code review fixes for DS audit fix.