Simplified the messaging indirection.