Decorative changes for unifying empty TypeSet/WrapSet; no universal cons though