Moved nf/whnf into Equivalence
Preliminaries for new AsShape operations