Simplify some of test_xchr.d