Reindented and fixed. (This has to go upstream!)