Start death refactoring: replace listeners by descriptor handlers