#38 improve management of current condition/expression but introducing ICurrentValidatationContext