Some fixes for reducing NPath complexity
Some fixes for reducing NPath complexity

mmoreram/GearmanBundle,kendrick-k/GearmanBundle,kendrick-k/GearmanBundle,mmoreram/GearmanBundle,mayeco/GearmanBundle,mayeco/GearmanBundle