Replacing the macrodefs for option types with enums and enum classes

[KOLANICH]

If you don't want enum classes, you can take only the first commit (available as a separate PR #37).