Purely cleanup of duplicated code, no functional change.
Signed-off-by: NMike Snitzer <snitzer@redhat.com>