LPS-37295 Don't double negate
LPS-37295 Fix unnecessary if and missing value assignment