This is what was done before. I didn't want to change too much in a refactor. We should do something here. I'll make another PR with that change unless you object.