#4357: Redo the plumbing.
#4357: Box plugin.