Making last updates before sn'ing this set of repos.