Account correctly for order, and remove unneeded frequent calls to some functions which cause a lot of printout