Merge #15: Cleanup helper classes.