Refactor line and branch rate fixes.