Change in mom[master]: Improve the way we declare and use (optional) collector fields