More work on key checker.