Minor changes to prepare the listener design.