r26684: Trivial cleanup from Matthias Dieter Wallnöfer, from bug 5090