Revert "Revert "Made SetupManager non-static. This has the obvious disadvantage that we need to pass it down to all the classes that need it, but has the huge advantage of all fillers being isolated and free of side effects.""

This reverts commit 972e4ad5ddfa2c3996142c6135d0286b31ab251a.