[No review required] Address code review feedback to address outstanding TODOs.