Rev. 21: Update grammar code for new grammar notation (parameters and availability restrictions).