I'd prefer to keep it, just so someone going through MessageManager later looking for performance improvements doesn't needlessly add a guard here. However it's not terribly important