Fixed a merge error (thank you, IE, for not supporting trailing commas in array/object definitions!)