Code simplification suggested by Sven Marnach.
1 file changed