Finished updates to var conversion.