Bug 5456/rewrite techniques to use normal ordering