Fix/crtp impl

@nimski Removes my terrible #define mistake.
Ah this is much smarter.