Fixed make_bonds.py for subclasses (v2).