Refactoring: make Hit boxing happen as late as possible

... I *think* I'm beginning to understand boxing logic...