CS: fix data types in docblocks and comments