i965: Rework the modifier info map