Fix compile errors.
Merge pull request #114 from csmith/fix-optional

Fix compile errors.