More editing cleanups after spousal review.