Updated Fabian's changes to use an *even* more reliable branch parsing mechanism.