Yes these feels a lot better: see [here](https://github.com/econsultancy/dotmailer/commit/0320181#L1L122)