Clean up statements to use type inference.