I think you're right, but it's going to take a fair bit of refactoring if we want to keep the same performance. I'll have a look at it :)