Remove extra comma that is confusing IE.
Repack and recombine previous several commits.