Mainly to get proper type-checking and consistency.
Signed-off-by: NJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>