Improved support for object property shorthand. Fixes gh-1813

cc @caitp 
could use `git commit --patch` to move the style fixes into a separate CL in case you need to minimize noise while bisecting at some point, but it's probably not a big deal.