ARM: Fix an old refacto.

Fixes PR15520.