Move border computation into unpruned traversal. Get rid of extraneous explicit initial reflow. Fixes #935.