Revert "distinguish between options and defaults"

This reverts commit e7804c5027633d18558c05b550ea11c46fb37c42.
Revert "replace macro constants with enum types for user facing constants"

This reverts commit d4bb6d693f0542bbf35bc1b6810100d5b2a901a8.