Merge "Rework receiver/dispatcher design slightly, and replace Layer usage."