Grammar regularity tweaks
Rebuild