More var conversion work.