Shorten generic type

[TrackerSB]

The generic type of any WizardPage is force to extend Optional<?>. So each WizardPage declaration looks like WizardPage<Optional<...>>. It would be shorten if the Optional would be removed from the declaration (and only the declaration, not the fact that the wizard page returns an Optional as result).