Fix some syntax errors left by bug 489028