Confirm/create the viability of a template for message collectors

[JohnnySn0w]

message collectors are used throughout the codebase, but I think they all use the same filter, and more or less could be simplified with a wrapper that takes parameters/callbacks/timeout.