Move some repeated code to a common helper.  No change in behavior.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>