Fix a bug where conditional variables weren't being expanded correctly.