Add less obtrusive coverage marks and Python 3 support