BUG-509: Refactor listener walking

No match.