Finish implementing new walker API