[CHANGELOG] Small cleanups.