Fix for spurious C-Unravel* wrappers.