t6050: use new utility functions.