Minor code cleanup.
Update changelog.