Quite a messy commit, hopefully new ones should be shorter Signed-off-by: Luca Fulchir <luker@fenrirproject.org>