Simplify version handling #631