semantic: Collapse storage types where possible.