Avoid copying exception when rethrowing.  Minor cleanup.