Ah, git ate my last diff. Luckily Dia saved a backup file for me.