Split out ADD_[METHOD,BRANCH]_COVERAGE_TRACE macros, and remove RUBY_EVENT_MCOVERAGE instruction from ADD_TRACE