git p4: rearrange submit template construction