Update on APEG grammar