Fix the types one more time.