I guess that's one way to do it, but let's merge this one first. I'll make the changes in a later PR.