Recognise MSVC architecture constants.
Significant reorganisation.