Expressions are now working correctly and properly removed if a
dependency is removed by the user.