Reduce duplication in follow-up work. No functional changes.
Signed-off-by: NJani Nikula <jani.nikula@intel.com>