A few pieces of code are unnecessarily duplicated. For easier
maintenance, we should fix this.

This should have no functional effect.
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>
Signed-off-by: NArtem Bityutskiy <artem.bityutskiy@intel.com>