DRILL-230: address additional code review comments