We have decided to leave it as it is for now. I will add a comment to make it more clear why this has been done.