Tiny patch for performance and code cleanup
Add ChangeLog entry for previous commit.