[BZ 1126410] Minor updates based on code review.