Fixed syntactic errors (final is a reserved word, no trailing ",") reported by closure compiler.