Clean up some concatentation inside interpolation