Add helpers for no call_site