[Peter: Various cleanups/fixes/simplifications] Signed-off-by: Murat Demirten <mdemirten@yh.com.tr> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>