Now validOnDate can be null or 0, w/ separate, defined meanings for those values; refactor, fix IDE warnings.
It seems some of these would not have required inspection to fix, if I'd switched more code to scala
already and used None instead of null, as the compiler would have found many of the issues between Long/long
and possible nulls.