Improved "already set" detection.