Retain the same api for all helpers

Functionality in one helper method seems to not
exist in the other helper methods, even though
they call into the same methods, this seems like
a bad inconsistency to have so we should fix that
and have a consistent api for all of these helper
methods instead.

Change-Id: I72aa66e5920a6093fc9df0c261c950a9cb225b76
Merge "Retain the same api for all helpers"