Shellvar: Add target as namevar, activate composite namevars, fix #2