Utilize once-only macro

Altered items:
untilnext