Move RewatchClasspath() calls into finally-blocks