Fixed broken merges from last commit; kept boost::next and boost::prior changes to BGL that went in by accident in that commit, though