Refs #5505: Rewrite techniques to use normal ordering 2.6, new versions

One commit for new versions, one commit for reordering