Fixes from review with @gannetson.