xmerge: simplify static final constructors

Change-Id: I40f98c77c5f922fdce8242dac402feaf534da6bf