More tweaks and refinement.
Ensure message routing is based on the binding.