Cleanup normal form expression implementation
Use a frozenset for the nfexpr instead of tuple
Use set.update instead of |= for clarity