Improved support for object property shorthand. Fixes gh-1813

cc @caitp 
ok, I'll follow up on that shortly