I can live with the current implementation. Much more important for me are the tests.