Switch to more DRYish version numbering