Refactor out uses of $key and $descriptor to use the keyProperty and descriptorProperty of a dojo store.