I've been adding a state machine whenever I find myself adding a state column for a couple of years now.

I have always found this streamlining at least one change in the couple of months after initial implementation.