More LineEx refactoring