Changed the locking in `Evaluators.remove()` to be bmore fine grained (on the individual `EvaluatorManager`) but also capturing the whole method, avoiding the NPE the build server found.