Fixed the separation of architectures somewhat wrt setup.