[CLEANUP] Refactor the Checker a bit.