Keep grammar accessible and be a bit more DRY