Clean up helper function usage.