Fixed a couple of redefine-root-related bugs.