Initial work on ObjectDefs.
Fix c4j grammar.