That's not really my decision to make. But right now, there doesn't appear to be much that we can do about Calum in terms of getting him out of Josiah's head, but I can see about maybe talking to Yen Sid about it while I'm here.

I'd say that if you think you can deal with Margaret/Maleficent better, then do what you can for her. We can figure out what to do to help Josiah in time, as long as it's not too late by the time we do find something.