I do not think the current approach is particularly problematic. At the same time I'm fine with the approach Daniel suggests