Clean up check-ties

Quite a bit less yucky now.