Changes per code review on 20130826.