Provide fixAutos API, use it to simplify transition code.