Switch to using new helper classes.