Pretty, single, commit for all changes.