-
More clean up.
Fixed compatibility issue with AMD compilers. Thanks to @pizthewiz and @seph.li for their reports.