- Standardise usage on IA-32 instead of a mix of IA32 and ix86.
- Add some missing options.
- Fix up some options.