[mr2883] reorder calling in AttackerStorage, mut give additional speedup and safety. testing.