I still find it hightly annoying that we can't have a helper that simply does the right thing for callers, but I guess this is the best thing we can get without a change of mind from the networking maintainers..