Minor cleanup in grammar