Cleaned up a few blinking state checks.