BondBuilder no longer using static workspace, plus generally refactored.