Flesh out callable support a bit more