I've never understood what the act of drawing or putting your weapon away has to do with claim at all? If you can claim without weapons drawn with spells and JA, why does putting your weapon away cause a loss of claim at all? If this particular and completely moronic element of the claim system was completely removed from the equation, problem solved for all scenarios.

I agree with 100% with the spirit of this thread. I think the implementation of the proposed fix, however, would cause other problems that would enable infinite zombying, as others have said.

Removing the disengage being tied to claim fixes the problem.