- fix issue with dn references being full DNs and then being escaped, which
  fails miserably.  If only a '?' is present, do a full raw replacement.
- mostly formatting changes