Update with 'new' function pointer changes.
Make <C-string> consistently capitalized.