Emptyuif

Various SUPER-HACKY changes to support proper empty sets. Co-ordinated with LH PR: XXX