Tweak JSON syntax slightly, to catch more invalid constructs

Closed Craig Barnes requested to merge json-syntax-tweaks into master