Code cleanup.
Fix ISetup<>.Callback() method implementation to return a wrapped version (issue #21).