Address review comments for Drill-379. WIP.