Code review of 97d3b6.