Added valve selectors to channel printout.
Improvements to when to try to generic instantiation, needed because of how messages now have their substitutions cleaned.