... with a little bit of refactoring.

But for some reason it does not seem to have an effect