Add data checks and improved flexibility for specifying joint callers. Fixes #619