Simplify expand-type