WIP: before introducing DealiasStructure