Reorganize listing code.
2 files changed