Merge "Remove beginCommand variants with a helper template."