Cs fixes

I understand that you don't want to enforce it with templates, but why do you want me to revert the change(s) above?