Looking more, we should probably also accept `i386` and `amd64`.  I can do that.