Bug 1053114 - test other shorthands affected by variable usage. r=heycam
Bug 1053114 - fix serialization of shorthands with token value subproperties. r=heycam