Fix Lime build, minor CFFI cleanup