More work on circle detection.