Made parser use grammar-actions