E.g. we had `arch = "arm"` in the former and `arch = "armv6"` in the latter. Try to have some more consistency.