Add Coveralls support again, remove some duplication.