Rename IdWithVersion to VersionedId.
Start annotating fields with @Nonnull, Javadoc.