Update a comment and undef an identifier

 * Trac #11452