More message router work.