Initial revision of several utility classes.