A few changes.

See commit message.