Refactor feed_record handling; #1160