Triggered by a smaller cleanup from Jianjun Kong <jianjun@zeuux.org>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>