Fix merge errors from the refactor-gfx merge.