builtin-apply.c: restructure "offset" matching