fix GitHub #122: "x64" being parsed as x operator plus number

fixes #122
fixes #123