builtin-tag.c: Fix two memory leaks and minor notation changes.