This addresses Ian C's comments on v1 of a previous patch (which was applied instead of v2). Signed-off-by: David Vrabel <david.vrabel@citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>