Use ripper/sorcerer to determine complete expressions
Add the oddly formatted Then integration test