constraint expansion now handles angles/dihedrals