AMD loader only runs factories once and I also cleaned up some unnecessary closures.