ARB prog parser: Fix a couple issues with previous merge from mesa_7_6_branch