fixup! Add support for static line tagging