Clean up codegen a bit

Author: lauzadis

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/auth/AuthSchemeProviderGenerator.kt

@@ -118,22 +118,16 @@ open class AuthSchemeProviderGenerator {
 
                 if (ctx.settings.api.enableEndpointAuthProvider) {
                     write("")
-                    withBlock("val authOptions: List<#T> = run {", "}", RuntimeTypes.Auth.Identity.AuthOption) {
-                        write("val endpointParams = params.endpointParameters")
 
-                        withInlineBlock("val endpointAuthOptions = if (endpointProvider != null && endpointParams != null) {", "} ") {
-                            write("val endpoint = endpointProvider.resolveEndpoint(endpointParams)")
-                            write("endpoint.#T", RuntimeTypes.SmithyClient.Endpoints.authOptions)
-                        }
-                        withInlineBlock("else {", "}") {
-                            write("emptyList()")
-                        }
-
-                        write("")
-                        write("#T(modeledAuthOptions, endpointAuthOptions)", RuntimeTypes.Auth.HttpAuthAws.mergeAuthOptions)
+                    write("val endpointParams = params.endpointParameters")
+                    withInlineBlock("val endpointAuthOptions = if (endpointProvider != null && endpointParams != null) {", "} ") {
+                        write("val endpoint = endpointProvider.resolveEndpoint(endpointParams)")
+                        write("endpoint.#T", RuntimeTypes.SmithyClient.Endpoints.authOptions)
                     }
+                    write("else { emptyList() }")
+                    write("val authOptions = #T(modeledAuthOptions, endpointAuthOptions)", RuntimeTypes.Auth.HttpAuthAws.mergeAuthOptions)
                 } else {
-                    write("val authOptions: List<#T> = modeledAuthOptions", RuntimeTypes.Auth.Identity.AuthOption)
+                    write("val authOptions = modeledAuthOptions")
                 }
                 write("")