PVS V501: Fix identical sub-expressions
PVS V595 fixes
PVS V555 fix