Refactor unlit code to improve error and line pragma handling

And to make it more like the original code that classified lines
separately from checking and transforming them.