Prepare for changeover to protocol-mostly-independent content handler