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