Adapt to libsyntax changes