Add effect state and move effect bypass from effect to effect state.