for(ServiceInfo serviceInfo : services.values())
{
	if(type.isAssignableFrom(serviceInfo.getType()) && serviceInfo.hasServiceKey(key))
		return serviceInfo;
}

Consider debugging code snippet like the above example. When looping through it, even if the if-clause holds false, the
step cursor will "step on" the "return serviceInfo;" line anyway. This is confusing as it leads me to believe that the
if-clause actually held true when it didn't. The step cursor should land on the closing brace '}' instead if the
if-clause is skipped which would be a lot clearer.