[4.3] Forward Thinking For Composer

All this "target-dir" stuff is deprecated. We better migrate over to the better way of doing it.

---
Replaces #4518.