Simplify definitions defoption is function now
Fix documentation according new defoption/defcommand