Add specialized Option type with macro combinators