Make scrutinizer happier

I applied the patches in scrutinizer and unify the `@return self` around the project.
Just to make scrutinizer happier… addresses #366
That would be a nice start, but the `Callable` part is what makes me cringe most.
I rather call that function `shouldDefinedServicesWithName` or something in that line…