Track specified/invisible more carefully.