added expansion of !expressions based on dict->scenario hierarchy