[2.1.1.5] Rewrite some things about target variables. Still a work in progress.