Fixes NestedRecord by improving on Tyler's work.