Templates now support adding callables (see #6176)