Ok, I'll create a separate commit for this and see what you think of the solution.