Specified over-general constraint.
Added optimization back in.
Generalized the relatively useless indexP pipe -- mostly just playing around.