Bug 5549/rewrite system techniques to use normal ordering on 2 11