Move walk helpers into own modules