Both functions should now be identical at first glance - seems that the IVAS version could simply be removed and replaced by the EVS version.