Further rewrites based upon A=M. Next goal is to pass PointerTest.