7 files changed, 10 insertions, 12 deletions
diff --git a/src/library/align.rs b/src/library/align.rs
index 674ecceb..eaef4d87 100644
--- a/src/library/align.rs
+++ b/src/library/align.rs
@@ -1,4 +1,4 @@
-use super::*;
+use crate::prelude::*;
 
 /// `align`: Align content along the layouting axes.
 ///
@@ -16,7 +16,6 @@ use super::*;
 /// There may not be two alignment specifications for the same axis.
 pub async fn align(mut args: Args, ctx: &mut LayoutContext) -> Value {
     let body = args.find::<SynTree>();
-
     let h = args.get::<_, Spanned<SpecAlign>>(ctx, "horizontal");
     let v = args.get::<_, Spanned<SpecAlign>>(ctx, "vertical");
     let pos = args.find_all::<Spanned<SpecAlign>>();
diff --git a/src/library/boxed.rs b/src/library/boxed.rs
index 81e3a96a..085176e0 100644
--- a/src/library/boxed.rs
+++ b/src/library/boxed.rs
@@ -1,5 +1,5 @@
-use super::*;
 use crate::geom::Linear;
+use crate::prelude::*;
 
 /// `box`: Layouts its contents into a box.
 ///
diff --git a/src/library/color.rs b/src/library/color.rs
index 143ce70a..a4958c53 100644
--- a/src/library/color.rs
+++ b/src/library/color.rs
@@ -1,11 +1,11 @@
-use super::*;
 use crate::color::RgbaColor;
+use crate::prelude::*;
 
 /// `rgb`: Create an RGB(A) color.
 pub async fn rgb(mut args: Args, ctx: &mut LayoutContext) -> Value {
-    let r = args.get::<_, Spanned<i64>>(ctx, 0);
-    let g = args.get::<_, Spanned<i64>>(ctx, 1);
-    let b = args.get::<_, Spanned<i64>>(ctx, 2);
+    let r = args.need::<_, Spanned<i64>>(ctx, 0, "red value");
+    let g = args.need::<_, Spanned<i64>>(ctx, 1, "green value");
+    let b = args.need::<_, Spanned<i64>>(ctx, 2, "blue value");
     let a = args.get::<_, Spanned<i64>>(ctx, 3);
     args.done(ctx);
 
diff --git a/src/library/font.rs b/src/library/font.rs
index 0a28beaa..60380def 100644
--- a/src/library/font.rs
+++ b/src/library/font.rs
@@ -1,8 +1,8 @@
 use fontdock::{FontStretch, FontStyle, FontWeight};
 
-use super::*;
 use crate::eval::StringLike;
 use crate::geom::Linear;
+use crate::prelude::*;
 
 /// `font`: Configure the font.
 ///
diff --git a/src/library/mod.rs b/src/library/mod.rs
index 66fc5d59..191a3920 100644
--- a/src/library/mod.rs
+++ b/src/library/mod.rs
@@ -15,7 +15,6 @@ pub use page::*;
 pub use spacing::*;
 
 use crate::eval::{Scope, ValueFunc};
-use crate::prelude::*;
 
 macro_rules! std {
     ($($name:literal => $func:expr),* $(,)?) => {
diff --git a/src/library/page.rs b/src/library/page.rs
index db76d2a1..2bf9f019 100644
--- a/src/library/page.rs
+++ b/src/library/page.rs
@@ -1,9 +1,9 @@
 use std::mem;
 
-use super::*;
 use crate::eval::Absolute;
 use crate::geom::{Linear, Sides};
 use crate::paper::{Paper, PaperClass};
+use crate::prelude::*;
 
 /// `page`: Configure pages.
 ///
diff --git a/src/library/spacing.rs b/src/library/spacing.rs
index b97f4640..b38f0607 100644
--- a/src/library/spacing.rs
+++ b/src/library/spacing.rs
@@ -1,6 +1,6 @@
-use super::*;
 use crate::geom::Linear;
 use crate::layout::SpacingKind;
+use crate::prelude::*;
 
 /// `h`: Add horizontal spacing.
 ///
@@ -19,7 +19,7 @@ pub async fn v(args: Args, ctx: &mut LayoutContext) -> Value {
 }
 
 fn spacing(mut args: Args, ctx: &mut LayoutContext, axis: SpecAxis) -> Value {
-    let spacing = args.get::<_, Linear>(ctx, 0);
+    let spacing = args.need::<_, Linear>(ctx, 0, "spacing");
     args.done(ctx);
 
     Value::Commands(if let Some(spacing) = spacing {