Shifting to InfoSet storage where possible,