this seems to get rid of some oddball failures
don't include nil callbacks in final options
ensure we don't call callback multiple times