Better support for new archs.