Do you plan to move this common code into common.soy, perhaps as part of a separate PR?