Remove variable name expansions