Issue 6557: Some code improvements after 580f022
Issue 6557: Mon bazar 2