Avoid mix between redefinition and undefintion.

Mix betwween redefine and undefine clause can make less consistent the code and make confused the developper intention.