Looking through this code whilst working on MDL-56881, I think we should be able to save a few queries and just generally tidy up the code here. Suggest having a look at performance too.