Hmm the whole patch is rather unreadable, why you changed the indentation?