Cleanup: use maybe to refine definition of toggle-dispatch
Allow insertion of hash characters in string content