Merging, but will file a bug for cleaning these up (it's used a few places).