Revert "Revert "Update `Modifier` type parameters in `mkListing`""

This reverts commit 8d2cb3ce6c82a2efc8416e678c67687c6551d89a.
Tidied up & removed whitespace.