Address Andy's documentation feedback.