Switch to preprocessing to allow for better handling of line-internal text
Add support for trivial inline text