Reverting state and context parameter order