Improved cyclic detection code quality.