Those are years old, I think we can remove them at this point (I've kept one from a closer version) and that makes the code was better.
To be merged after MR #2