CXX-186 Use StringData, improve comments, take refs