New message types for cleaner implementations of existing ones.

This is *not* ready for a merge.