Fixes for recent changes in libsyntax.
fix build