Some more minor modifications to the way mixins are used. This decreases compile-time drastically, it also reduced the total size of the headers by another 200kb.