Fix enclosed expressions