Fixes of the rest of the code to be compatible with
bonds not storing bond type.