Issue #5096: Improve performance of MoonWarriors