eliminate one-off version checking by making consistent
cleaner diffs