Revert "distinguish between options and defaults"

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

This reverts commit 4fb74539250d83e82e40e85d39e2e756eccdb8a3.