Also add a little code cleanup.
Signed-off-by: NJaroslav Kysela <perex@perex.cz>