This is a nice, simple, good little fixup/cleanup we should have independent of this PR, please send it up as separate one, thx.