Fix walk-* and use arrays for bindings