Bit of cleanup, and add changelog.