Fixes from @erikr's review.