Towards #33. Also simplified Grammar rule references by removing static
modifier.