Fix the glx refactor so it all compiles.