Use current helpers API to avoid deprecation warnings.

I got annoyed from the deprecation warnings so I updated the helpers to be defined in the current way. So, now we get no more deprecation warnings which is nice.