Penultimate changes for 1.74

See changes around p. 19