Improve macro detection.
Fixed a number of dash tests