consistently use variable storage instead of @storage in AutoinstClone.ycp