Make spaghetti-code-quality great again.

2019-03-22, Edouard Tisserant