Yes, this function now goes beyond 80 columns, but it's almost 
readable, while the previous version was not.

Also removed some #ifdefs