Add dynamic helpers, remove some old helpers.