Do not remove fields default values that are not primitive literals
Only revert null checks when statements are simple