Cleanup from -> to conversion and add tests.