This patch fixes several formatting errors, which I
missed before pushing previous patches. Mostly because
of missing cppi package.