st/mesa: cleanups after unification of st_vertex/common program