remove ObjectParserAndBuilder defn, and minor refactorings