Simplify architecture detection