Responded to all comments but one on reviewboard: https://reviews.apache.org/r/17074/