Fix for dependencies and rust changes, include unboxed closures, and fix modifiers.