A little more refinement around #91