I would think so.
Instead however I was considering parameterizing the Optional<T> class and its instantiation. If for no other reason to support using multiple template files.