Add type checking of record conditions