It's shorter and may get rid of false Coverity positives 203489 and 203498 and fix #18424 and duplicate #18425. Signed-off-by: Marc Herbert <marc.herbert@intel.com>