...G...... [ZBX-8728] code improvements (no functional changes)