Bug 5547/rewrite system techniques to use normal ordering on 2 6