More shell cleanup (variable safety).