(QENG-1225) Respond to PR feedback.

Signed-off-by: Wayne Warren <waynr@sdf.org>