Previously these depended on $settings which wouldn't be loaded at function definition time.