First part changes of DefaultRecordStore check-style compliance.