Added missing DOCUMENTATION args to define-handler.

No idea why that was missing in the first place???
Cleanup by dissecting note assembly into a function with overridable defaults.