Merged the remaining helpers into other classes.