I considered adding the lightsaber extend/retracts at the stop frames (which I've adjusted for position), but at this time, I'm leaving them as it is. As a rule, I try to do as little as I possibly can, and if it still bothers me a month later, then I'll go back. The lightsaber extends are in the "we'll look at it again later" category.
_Mike