Update for libsyntax changes