Rewrite a few jail function to have multi-value returns instead of maps