If: Incorporate CMP0054 suggestions
Merge topic 'if-sanity' into next

30db9001 If: Incorporate CMP0054 suggestions