Minor tweaks from review of Issue #494