Clean up check suite a little bit.