Update CHANGES.
Fix broken test and invalid variable declarations.