A little bit of cleanup behind commit r5f88ceab2269