Minor overhaul.

See new changelog.