Properly use __call__ semantics in custom S class.
Merge branch 'master' into try-your-own