A couple additional simplifications.

As noted by reviewer.