Updates from review:
https://reviews.apache.org/r/16764