Thanks for looking after this port, Stephen. While here, I'll make some cosmetic realignments and convert EXTRACT_SUFX to USES. PR: 192891 Submitted by: maintainer (Stephen Fisher)