Depluralized, moved constants again