Code review iteration #2.