I agree.  I note that we're doing this string interpolation since 75c71d58de26855ee142da9948e0f74138e3bc28.  I'll change this in the code and the tests.