As per suggestions by IDEA. I didn't update Dagger, though, since this could break some APIs we're using.