Pay part of the technical debt.

Signed-off-by: Clement Escoffier <clement.escoffier@gmail.com>