I seem to have inadvertently fixed the bug, most likely when I rewrote
the regex handlers.