Remove more optimizer calls.