
        Silence warning with minor cleanup

c58cf56