Hmm, thought I had removed all the uses of passed in entdirs. 

Looks like I got rid of anything that used it, so those can go away and just use the injected ones.