Have the switch track its status a bit better.