Tidyups in the transfer provider implementations