Refactor AssertionsMacro to reduce code duplication.
Merge branch 'macro-refactor' of https://github.com/cheeseng/scalatest