Also removes some unneeded CPP keywords. Pull Request: https://projects.blender.org/blender/blender/pulls/107217