Of course, if you don't think the extra layer is worth it, feel free to ignore that PR...