libsyntax: Fix more merge fallout.