Address some comments from thockin@

whoops, my bad.  I missed those.  will fix and ping the PR again.

--brendan