Made modifications to conform to changes in Swiffe and to leverage the new call_function() method.