improve of note message and minor refactoring of my last
patch (r181847).