Changes related to want/have modes.