(ARM) Refactor ARM target