Ingrain scoped normalization, add forms