Services and Targets have no attribute "__name__".
This (6e2cb68) also applies even if the variable is not called "x".
Everything includes "single".
Apply recent changes from branch 'both' into parallelism.

Conflicts:
	usr/lib/yarfi/service.py