Merge blocker companion hook + refactoring.