Move expand-at-rule :default
Update ChangeLog