TODOs fixed in core.logic, via LOGIC-100 and LOGIC-101 patches.