Pointed out by s_graf at telus.net, patch from Markus Hennecke (thanks!) While here update patch comments.