Twiddle some useless changes from trunk.