SAMZA-2; adding pluggable message chooser.