Moved template params from class to function level in dispatch::envelope for those we don't actually dispatch on.