Improved support for object property shorthand. Fixes gh-1813

cc @caitp 
We've inherited this categorization design :(