That change makes sense but is orthogonal to this one, so I'd rather not convolve the two.