Bug 5546/rewrite system techniques to use normal ordering