scan-all: Change how $suffix works, make more flexible