Make sure Borrowed constructors aren't updated

[Sorry about all the merges. Apparently I've done something weird locally and I can't persuade git that there's really no need for them.]