Revert "Replace set calls with _cset"

This reverts commit ca229d0a1898b81aa634f31e57990fe76344a309.