Use util.isDate everywhere