Fixes for recent changes in libsyntax.

Title says it all.