branch: restrict @-expansions when deleting