Yet more fixes to VersionNumber comparisons when development stages are
used.