Fix nested expressions