More work towards making bumping the major version less work...