More minor changes from code review. [skip ci]