This is not a complicated refactoring but I don't think we need to address that before landing this PR.