Small cleanup from code review with Eugene and John.