Made targeting of functions to convert less broad.