Add documentation.
Remove commented notes.  Simplify incorporation of full options in EDN map.