Small improvements to utility classes.