Further style improvements in flow router

* Reverted earlier change that actually slowed routine (!)
* Marginal speed improvements in two other functions by removing loops.
* Added a timer on the driver to aid debugging