tweaks to walker code gen (I should really clean that up..