Remove macro dispatch character handling

We decided to just include the dispatch character in the main set of
macro chars.
Fix issue with wrapping elements with trailing macro chars