Clean up check-ties

Quite a bit less yucky now. Just need to update core.logic to master in order use this.