Reinstate more tests. (But not all.) Address one of the two panic() fn type mismatches.