DRILL-230 Address additional code review comments.