More trivial upstream alignment.