Updates per Claude's review.