Let the commands store flagComp functions internally (and avoid global state)

Let the commands store flagComp functions internally (and avoid global state) #1308