ENH: Add updates and fixes from the Gerrit review.