Those helpers don't add any clarity and are easy to use wrong.  Spell
them out to make more obvious what's happening.
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>