Initial discussion of remove-cstr-calls