Add missing null and undefined to autoTypeConvert