A few cleanups that were originally part of a larger patch but are
better submitted separately.
Signed-off-by: NHans de Goede <hdegoede@redhat.com>
Cc: Mark van Doesburg <mark.vandoesburg@hetnet.nl>
Signed-off-by: NJean Delvare <khali@linux-fr.org>