Clean support of ObjectiveAlterer.

We are back to the original semantic.

10 failures left