bonding: options handling cleanup