Update ExpandHelper from CM10.1