Fix for libsyntax changes