This includes:
- The fix of r16541 for the use of SetValue() for strings not in the list of choices.
- Defaulting the choices to ['@N', '@C', '@H', '@O', '@P'] if not supplied.
- A tooltip white space fix.
- Removal of the None element in the list of choices, as this is not a read only box.
