Properly detect architecture.