Expressions are now cleanly extracted