Done (the diff looks nicer now, too).