Issue #3326730: Refactor "${var}" and "${expr}" style interpolation to "{$var}" and "{$expr}" instead