Fix default arguments

error: default arguments cannot be added to an out-of-line definition of
a member of a class template
Revert "Fix default arguments"

This reverts commit 9f71022fe358bbd610200ed8329e991d54cc368b.