Worth looking at this with `?w=1` - the diffs are more straightforward than they look; the existing code just got moved into the "else" below.