Add remaining hook insertions
Add "extras" to a couple more templates and template calls. Missed a couple of places that hooks need to be inserted. Also - make it possible to set private_envelope flag on return from hook call.
Add "extras" to a couple more templates and template calls. Missed a couple of places that hooks need to be inserted. Also - make it possible to set private_envelope flag on return from hook call.