Use ciphersuite id when matching if we've got one