Those two need to be changed to the new interpolation syntax, right?