Minor stuff, style, etc.
WITH-ONCE-ONLY-CTX: Don't use WITH1 here as it'll add `IT` to the context.