Fix a trailing comma breaking IE7

Found a few more cases where IE just totally barfs.
Relates to #1929