More improvements to GLInject, still missing stream matching.