refs #6881 A bit less shared pointers.