Rentib

I haven't noticed any performance differences. It is just that the patch seems a bit simpler. I can agree that the macros aren't the best solution though.