Fixed handling of multi-part conditional variables