Smatter around MK_COVERAGE=no in a few more spots
I wish someone had made this voodoo common ages ago...