More refactoring. Removes the UseAdaptableMinimumImprovement option.

Note that this requires changes to Alloy:
02035289be10be1d9e5ac4a1980caba8aa025640
Refactor. Forgot to revert some of the comments in Options