Initial clean-up (and softfloat target declaration fix) for ARM opts