Simplified workaround for rvalue references in a tuple