I'm still not sure that we should do this.  This is just to workaround a user-error, right?  Why not just render the pick pass the same as the color pass, but with the standard pick states set?