diff --git a/stdlib/aws/cloudformation/cloudformation.cue b/stdlib/aws/cloudformation/cloudformation.cue
index 91f85361..8a22f197 100644
--- a/stdlib/aws/cloudformation/cloudformation.cue
+++ b/stdlib/aws/cloudformation/cloudformation.cue
@@ -20,7 +20,9 @@ import (
 	stackName: string @dagger(input)
 
 	// Stack parameters
-	parameters: [string]: _ @dagger(input)
+	parameters: {
+		...
+	}
 
 	// Behavior when failure to create/update the Stack
 	onFailure: *"DO_NOTHING" | "ROLLBACK" | "DELETE" @dagger(input)
@@ -44,7 +46,9 @@ import (
 		}
 	}
 
-	outputs: [string]: string @dagger(output)
+	outputs: {
+		[string]: string @dagger(output)
+	}
 
 	outputs: #up: [
 		op.#Load & {
diff --git a/stdlib/aws/ecs/run-task.cue b/stdlib/aws/ecs/run-task.cue
index a6a5a656..c86907eb 100644
--- a/stdlib/aws/ecs/run-task.cue
+++ b/stdlib/aws/ecs/run-task.cue
@@ -17,7 +17,9 @@ import (
 	taskArn: string @dagger(input)
 
 	// Environment variables of the task
-	containerEnvironment: [string]: string @dagger(input)
+	containerEnvironment: {
+		[string]: string @dagger(input)
+	}
 
 	// Container name
 	containerName: string @dagger(input)
diff --git a/stdlib/aws/eks/eks.cue b/stdlib/aws/eks/eks.cue
index f7aa12a1..64dfa53a 100644
--- a/stdlib/aws/eks/eks.cue
+++ b/stdlib/aws/eks/eks.cue
@@ -19,7 +19,7 @@ import (
 	// kubeconfig is the generated kube configuration file
 	kubeconfig: {
 		// FIXME There is a problem with dagger.#Secret type
-		string @dagger(output)
+		string
 
 		#up: [
 			op.#Load & {
@@ -62,5 +62,5 @@ import (
 				format: "string"
 			},
 		]
-	}
+	} @dagger(output)
 }
diff --git a/stdlib/docker/docker.cue b/stdlib/docker/docker.cue
index 8a432bf2..eb99429b 100644
--- a/stdlib/docker/docker.cue
+++ b/stdlib/docker/docker.cue
@@ -46,7 +46,7 @@ import (
 // Build a Docker image from the provided Dockerfile contents
 // FIXME: incorporate into #Build
 #ImageFromDockerfile: {
-	dockerfile: string @dagger(input)
+	dockerfile: string           @dagger(input)
 	context:    dagger.#Artifact @dagger(input)
 
 	#up: [
diff --git a/stdlib/file/file.cue b/stdlib/file/file.cue
index 6c2cd1e3..1e811272 100644
--- a/stdlib/file/file.cue
+++ b/stdlib/file/file.cue
@@ -7,8 +7,8 @@ import (
 )
 
 #Create: {
-	filename:    !="" @dagger(input)
-	permissions: int | *0o644 @dagger(input)
+	filename:    !=""           @dagger(input)
+	permissions: int | *0o644   @dagger(input)
 	contents:    string | bytes @dagger(input)
 
 	#up: [
@@ -17,9 +17,9 @@ import (
 }
 
 #Append: {
-	filename:    !="" @dagger(input)
-	permissions: int | *0o644 @dagger(input)
-	contents:    string | bytes @dagger(input)
+	filename:    !=""             @dagger(input)
+	permissions: int | *0o644     @dagger(input)
+	contents:    string | bytes   @dagger(input)
 	from:        dagger.#Artifact @dagger(input)
 
 	orig: (#read & {path: filename, "from": from}).data @dagger(output)
@@ -30,27 +30,27 @@ import (
 }
 
 #Read: {
-	filename: !="" @dagger(input)
+	filename: !=""             @dagger(input)
 	from:     dagger.#Artifact @dagger(input)
-	contents: (#read & {path: filename, "from": from}).data @dagger(output)
+	contents: (#read & {path:  filename, "from": from}).data @dagger(output)
 }
 
 #read: {
-	path: !="" @dagger(input)
+	path: !=""             @dagger(input)
 	from: dagger.#Artifact @dagger(input)
 	data: {
-		string @dagger(output)
+		string
 		#up: [
 			op.#Load & {"from":   from},
 			op.#Export & {source: path},
 		]
-	}
+	} @dagger(output)
 }
 
 #Glob: {
 	glob: !="" @dagger(input)
 	filenames: [...string] @dagger(input)
-	from:  dagger.#Artifact @dagger(input)
+	from:  dagger.#Artifact   @dagger(input)
 	files: (_#glob & {"glob": glob, "from": from}).data @dagger(output)
 	// trim suffix because ls always ends with newline
 	filenames: strings.Split(strings.TrimSuffix(files, "\n"), "\n") @dagger(output)
diff --git a/stdlib/gcp/gcr/gcr.cue b/stdlib/gcp/gcr/gcr.cue
index 6a7d02b2..aebc1149 100644
--- a/stdlib/gcp/gcr/gcr.cue
+++ b/stdlib/gcp/gcr/gcr.cue
@@ -13,7 +13,7 @@ import (
 	// GCR credentials
 	username: "oauth2accesstoken"
 	secret: {
-		string @dagger(output)
+		string
 
 		#up: [
 			op.#Load & {
@@ -40,5 +40,5 @@ import (
 				source: "/token.txt"
 			},
 		]
-	}
+	} @dagger(output)
 }
diff --git a/stdlib/gcp/gke/gke.cue b/stdlib/gcp/gke/gke.cue
index 9afa0d71..69438fea 100644
--- a/stdlib/gcp/gke/gke.cue
+++ b/stdlib/gcp/gke/gke.cue
@@ -19,7 +19,7 @@ import (
 	// kubeconfig is the generated kube configuration file
 	kubeconfig: {
 		// FIXME There is a problem with dagger.#Secret type
-		string @dagger(output)
+		string
 
 		#up: [
 			op.#Load & {
@@ -54,7 +54,7 @@ import (
 				format: "string"
 			},
 		]
-	}
+	} @dagger(output)
 }
 
 #Code: #"""
diff --git a/stdlib/git/git.cue b/stdlib/git/git.cue
index 569360fa..35713db0 100644
--- a/stdlib/git/git.cue
+++ b/stdlib/git/git.cue
@@ -7,8 +7,8 @@ import (
 // A git repository
 #Repository: {
 
-	remote: string @dagger(input)
-	ref:    string @dagger(input)
+	remote: string       @dagger(input)
+	ref:    string       @dagger(input)
 	subdir: string | *"" @dagger(input)
 
 	#up: [
diff --git a/stdlib/go/go.cue b/stdlib/go/go.cue
index 82f11e7b..0fc62547 100644
--- a/stdlib/go/go.cue
+++ b/stdlib/go/go.cue
@@ -47,7 +47,9 @@ import (
 	source: dagger.#Artifact @dagger(input)
 
 	// Environment variables
-	env: [string]: string @dagger(input)
+	env: {
+		[string]: string @dagger(input)
+	}
 
 	#up: [
 		op.#FetchContainer & {
@@ -93,7 +95,9 @@ import (
 	// Specify the targeted binary name
 	output: string @dagger(output)
 
-	env: [string]: string @dagger(input)
+	env: {
+		[string]: string @dagger(input)
+	}
 
 	#up: [
 		op.#Copy & {
diff --git a/stdlib/js/yarn/yarn.cue b/stdlib/js/yarn/yarn.cue
index fee532c0..81b9bbed 100644
--- a/stdlib/js/yarn/yarn.cue
+++ b/stdlib/js/yarn/yarn.cue
@@ -16,7 +16,9 @@ import (
 	source: dagger.#Artifact @dagger(input)
 
 	// Environment variables
-	env: [string]: string @dagger(input)
+	env: {
+		[string]: string @dagger(input)
+	}
 
 	// Write the contents of `environment` to this file,
 	// in the "envfile" format.
diff --git a/stdlib/netlify/netlify.cue b/stdlib/netlify/netlify.cue
index c141da2d..d9618e9d 100644
--- a/stdlib/netlify/netlify.cue
+++ b/stdlib/netlify/netlify.cue
@@ -36,25 +36,25 @@ import (
 	// Website url
 	url: {
 		os.#File & {
-			from: ctr
-			path: "/netlify/url"
-		}
+				from: ctr
+				path: "/netlify/url"
+			}
 	}.read.data @dagger(output)
 
 	// Unique Deploy URL
 	deployUrl: {
 		os.#File & {
-			from: ctr
-			path: "/netlify/deployUrl"
-		}
+				from: ctr
+				path: "/netlify/deployUrl"
+			}
 	}.read.data @dagger(output)
 
 	// Logs URL for this deployment
 	logsUrl: {
 		os.#File & {
-			from: ctr
-			path: "/netlify/logsUrl"
-		}
+				from: ctr
+				path: "/netlify/logsUrl"
+			}
 	}.read.data @dagger(output)
 
 	ctr: os.#Container & {
diff --git a/stdlib/terraform/terraform.cue b/stdlib/terraform/terraform.cue
index 55310d26..9ce68852 100644
--- a/stdlib/terraform/terraform.cue
+++ b/stdlib/terraform/terraform.cue
@@ -12,9 +12,13 @@ import (
 
 	source: dagger.#Artifact @dagger(input)
 
-	tfvars?: [string]: _ @dagger(input)
+	tfvars?: {
+		...
+	}
 
-	env: [string]: string @dagger(input)
+	env: {
+		[string]: string @dagger(input)
+	}
 
 	state: #up: [
 		op.#FetchContainer & {