Reduce some complexity.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.0'

Conflicts:
	src/Orchestra/Resources/Dispatcher.php

Signed-off-by: crynobone <crynobone@gmail.com>