[hcobb]

My suggestion is to lift the effect at the end of the turn the player's next action occurs in. This way we don't reopen when exactly a dodge happens, etc.

Other edge cases would be things like agile archer recovering his second shot for that turn after taking the penalty on his first shot and so on.