Detect amd64 as x86_64 and rename strtonum -> str2num