Cleanup, added machine-specific as well as architecture-specific inits.