Removed the GNU-specific macro stuff.