Yeah I was pondering this back and forth. I admit that this looks a bit clumsy. We usually try to not touch oFono "core" definitions, but maybe this is too ugly?