Fix Camlp4 parser bug, replacing '=' with ':='

Also rationalize order of field names.