Respond to code review for const/*