Simplify target construction.