Add missing brace.
Sync toolkit.
Update prototypes.
Rename function to avoid conflict with new API.