Code review by mmillman.