BondAngle refactorings, see #52