Reorganization for pass-message? checks.
Vastly simplified generic-infer implementation.