strx: Fix array index out of bounds error.
strx: Don't reuse macro name (fixes compiler warning).