Clean up some susceptible expressions