Cleaned up glitches in generic fdw.