Minor optimization & new test for nullable grammar