A little more libsyntax cleanup