Patch from Nicolas Pitre

Too many macro with too generic names.  Let's remove unneeded code and
redundant/unused macros.  This also prevent namespace clash with upcoming 
patches.