Now validOnDate can be null or 0, w/ separate, defined meanings for those values; refactor, fix IDE warnings.