Move border computation into unpruned traversal. Get rid of extraneous e...

...xplicit initial reflow. Fixes #935.