Tinkering with normalized member rewriting

and the adaptation phase along the way :|
Normalization test 1 ported. Yaay!