Add omissions from 3142ae.