chg: code simplification in walk