Minor cleanup.

Fixes Clang warnings.
Fixed compilation of test on ES2.