Further API changes propogating. Changed AWORMap to something easier to reason about. AWORSet of keys + dict of keys and values. More test coverage