Code cleanup
Grammar entities support binary serialization.