Debugging and cleanup to get the CALL operator to work.