Flesh out remaining tour of remove-cstr-calls