I followed the current pattern used in MassIndexerImpl. If you want to change that, I suppose it should be done globally in another commit.