Apparently the shortcut variants are only v2.0+ so need to check the technique used to determine if we should used expanded or shortened forms.