Remove obsolete value from optimisations list and add one that should be there by default.  Tweak spec.