Cleanup of code duplication: unified member-functions for non-templates
Cleanup of code duplication: unified member-functions for non-templates

erikvalkering/smartref,erikvalkering/smartref,erikvalkering/smartref