Address some comments from thockin@

Brendan, do you want to address this here, later, or not at all?