Second part changes DefaultRecordStore check-style compliance.