Minor code improvements which came to my mind while sleeping...