Removes duplicate setting of state_when_nil option