Some minor cleanup.
Fix a bug in tuple-record handling.  Thanks to Saumya Debray for the report.
Merge branch '1.4.x'