Refector walker code to be easier to follow.