Replaced strings with variables in architecture detection.