Update and clean up BDPL-Grammar.