Removed 'Functor' constraint.
Fixed merge bugs in Shared.