Fix both comments and Null > No/None.