Initial work towards 3.1.