CSPACE-5943: Tweaks to several comments.