Tighten up detection and logging of "want to" decisions