Further fixes to BranchSiteREL.bf re-entrancy. Cleaning up standard files to work with RELAX.bf