Fix '[$$]'-like expressions