[#2212] CID37536:

Removed null checks on literal arrays
[#2212] CID37531:

Replaced comma with 'or'