Convert pairs of "actual"/"expected" constants into one template

... with marked expected omissions, to reduce maintainance effort