xci: Fix extracting scenarios for generic scenarios