Uncomment the removal of .Expr handling by default