Three commits for three nits.

See each commit for detail.