minor changes to ReadRecordWrapper and code organization (a.k.a. C++ migration)