Remove unnecessary recursion from CpWalker and un-ignore the re-index test.