Fixing warnings.  Renaming Nullable->Optional internally.