Make substitute-number work on AMD64 and i386